From: Tim Starling <tstarling@users.mediawiki.org>
Date: Mon, 13 Oct 2008 14:19:25 +0000 (+0000)
Subject: Fixed getSlavePos() to use the SQL thread fields, not the IO thread fields.
X-Git-Tag: 1.31.0-rc.0~44763
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=5688ff12c8724824d759747a05ef0b37650f3e6e;p=lhc%2Fweb%2Fwiklou.git

Fixed getSlavePos() to use the SQL thread fields, not the IO thread fields.
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index da85801def..1ca563ba54 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1919,7 +1919,7 @@ class Database {
 		$res = $this->query( 'SHOW SLAVE STATUS', 'Database::getSlavePos' );
 		$row = $this->fetchObject( $res );
 		if ( $row ) {
-			return new MySQLMasterPos( $row->Master_Log_File, $row->Read_Master_Log_Pos );
+			return new MySQLMasterPos( $row->Relay_Master_Log_File, $row->Exec_master_log_pos );
 		} else {
 			return false;
 		}